bitkeeper revision 1.1010.1.14 (40e03b62fW40sc6EpkeVtIAfp2wE-w)

Fix includes.

diff --git a/tools/lib/gzip_stream.c b/tools/lib/gzip_stream.c
index 1e67b4d7d7e9794a753ab1455f6f14d88012eb99..af46023f9dc01127245dfa963f86d30913ed64f6 100644 (file)
--- a/tools/lib/gzip_stream.c
+++ b/tools/lib/gzip_stream.c
@@ -28,8 +28,6 @@
 
 #include "zlib.h"
 
-extern FILE* gzfile(gzFile file);
-
 #include "allocate.h"
 #include "gzip_stream.h"
 
@@ -59,18 +57,6 @@ static inline gzFile get_gzfile(IOStream *s){
     return (gzFile)s->data;
 }
 
-/** Control buffering on the underlying stream, like setvbuf().
- *
- * @param io gzip stream
- * @param buf buffer
- * @param mode buffering mode (see man setvbuf())
- * @param size buffer size
- * @return 0 on success, non-zero otherwise
- */
-int gzip_stream_setvbuf(IOStream *io, char *buf, int mode, size_t size){
-    return setvbuf(gzfile(get_gzfile(io)), buf, mode, size);
-}
-
 /** Write to the underlying stream.
  *
  * @param stream destination
@@ -113,7 +99,7 @@ static int gzip_error(IOStream *s){
     int err;
     gzFile *gz = get_gzfile(s);
     gzerror(gz, &err);
-    return (err == Z_ERRNO ? ferror(gzfile(gz)) : err);
+    return (err == Z_ERRNO ? 1 /* ferror(gzfile(gz)) */ : err);
 }
 
 /** Close a gzip stream.

diff --git a/tools/lib/gzip_stream.h b/tools/lib/gzip_stream.h
index 63acb8cf1b5c230dcd5d93f51fb38c99a29ed86b..cf76d252757afda1488d5509d201d79f25be2647 100644 (file)
--- a/tools/lib/gzip_stream.h
+++ b/tools/lib/gzip_stream.h
@@ -27,7 +27,5 @@
 extern IOStream *gzip_stream_new(gzFile *f);
 extern IOStream *gzip_stream_fopen(const char *file, const char *flags);
 extern IOStream *gzip_stream_fdopen(int fd, const char *flags);
-
-extern int gzip_stream_setvbuf(IOStream *io, char *buf, int mode, size_t size);
 #endif
 #endif /* !_SP_FILE_STREAM_H_ */

diff --git a/tools/misc/Makefile b/tools/misc/Makefile
index 69651f2152ffc222eee90fad4cf12a25c0a315bb..9891676d5a578493e32bd87616bbd473cd8fbe40 100644 (file)
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
@@ -4,6 +4,7 @@ CFLAGS     = -Wall -O3
 EXTRA_INC  = -I../../xen/include/hypervisor-ifs
 EXTRA_INC += -I../../linux-xen-sparse/include -I../xc/lib
 EXTRA_INC += -I../xu/lib
+EXTRA_INC += -I../lib
 
 HDRS     = $(wildcard *.h)
 SRCS     = $(wildcard *.c)

diff --git a/tools/xc/lib/xc_io.h b/tools/xc/lib/xc_io.h
index 7a23cb91ae37f3d2e29c66f968f8ed4f16b657c0..37febb52f18424977d1d8723671851dfae35002a 100644 (file)
--- a/tools/xc/lib/xc_io.h
+++ b/tools/xc/lib/xc_io.h
@@ -2,7 +2,7 @@
 #define __XC_XC_IO_H__
 
 #include "xc_private.h"
-#include <iostream.h>
+#include "iostream.h"
 
 typedef struct XcIOContext {
     u32 domain;

diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
index cce1150b1659659411ca9a73d0a5d50f2214939c..f4319be6edac534c1fa0015a58a775f6b3be1ff5 100644 (file)
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
@@ -4,6 +4,7 @@ CFLAGS   = -Wall -O3 -Werror
 CFLAGS  += -I../../xen/include/hypervisor-ifs
 CFLAGS  += -I../../linux-xen-sparse/include
 CFLAGS  += -I../xu/lib
+CFLAGS  += -I../lib
 
 HDRS     = $(wildcard *.h)
 OBJS     = $(patsubst %.c,%.o,$(wildcard *.c))